bitkeeper revision 1.7.1.3 (3dee4b08B0Sp887xmUMeIHtMAFz15g)

makefile tweak for meteors (ensure tulip loads)

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 8de4879853617dbce29239cfc60bb92764853a50..4fe10ce2d4fd725b61470ca060285222aa711ace 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -1,3 +1,5 @@
 BitKeeper/*/*
 PENDING/*
 xen-2.4.16/common/kernel.c.old
+xen-2.4.16/common/kernel.c.ok-ish
+xen-2.4.16/size.image

diff --git a/xen-2.4.16/drivers/net/Makefile b/xen-2.4.16/drivers/net/Makefile
index 69b624e792f35a0dd9694468a5ff218c451ec1c4..4b46be791ac8aaa1440ada9a9bc5ba1166a09b92 100644 (file)
--- a/xen-2.4.16/drivers/net/Makefile
+++ b/xen-2.4.16/drivers/net/Makefile
@@ -3,7 +3,7 @@ include $(BASEDIR)/Rules.mk
 
 default: $(OBJS)
        $(MAKE) -C tulip
-       $(LD) -r -o driver.o tulip/tulip.o $(OBJS)
+       $(LD) -r -o driver.o $(OBJS) tulip/tulip.o 
 
 clean:
        $(MAKE) -C tulip clean